From: Sebastian Keller Date: Sat, 12 Aug 2023 15:30:24 +0000 (+0200) Subject: shell/camera-monitor: Remove hooks before destroying objects X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~320^2^2~104 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e7c269e01491b42734eb4ea2fdb9e46a941616c9;p=gnome-shell.git shell/camera-monitor: Remove hooks before destroying objects Otherwise removing the hook will try to unlink from a list whose previous element belonged to the already destroyed object. Fixes: d09d24666 ("shell: Add device monitor for cameras") Part-of: --- diff --git a/src/shell-camera-monitor.c b/src/shell-camera-monitor.c index 1b98b7dc8..1e2e0f145 100644 --- a/src/shell-camera-monitor.c +++ b/src/shell-camera-monitor.c @@ -297,10 +297,10 @@ shell_camera_monitor_disconnect_core (ShellCameraMonitor *monitor) g_ptr_array_set_size (monitor->node_list, 0); g_clear_handle_id (&monitor->delayed_disable_id, g_source_remove); - g_clear_pointer ((struct pw_proxy**) &monitor->registry, pw_proxy_destroy); spa_hook_remove (&monitor->registry_listener); - g_clear_pointer (&monitor->core, pw_core_disconnect); + g_clear_pointer ((struct pw_proxy**) &monitor->registry, pw_proxy_destroy); spa_hook_remove (&monitor->core_listener); + g_clear_pointer (&monitor->core, pw_core_disconnect); } static gboolean